tests: Use the new macros for adding instance private data
authorEmmanuele Bassi <ebassi@gnome.org>
Thu, 4 Jul 2013 23:09:31 +0000 (00:09 +0100)
committerEmmanuele Bassi <ebassi@gnome.org>
Tue, 9 Jul 2013 08:30:02 +0000 (09:30 +0100)
https://bugzilla.gnome.org/show_bug.cgi?id=702996

testsuite/gtk/gtktreemodelrefcount.c

index 7f29f994e15f7242ed6db3f0b5052e9c139c7518..69f403656b1fd79f183f676fc26bd162c16095e9 100644 (file)
@@ -55,6 +55,7 @@ static void      gtk_tree_model_ref_count_unref_node      (GtkTreeModel      *mo
 
 
 G_DEFINE_TYPE_WITH_CODE (GtkTreeModelRefCount, gtk_tree_model_ref_count, GTK_TYPE_TREE_STORE,
+                         G_ADD_PRIVATE (GtkTreeModelRefCount)
                          G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL,
                                                 gtk_tree_model_ref_count_tree_model_init))
 
@@ -83,9 +84,7 @@ row_removed (GtkTreeModelRefCount *ref_model,
 static void
 gtk_tree_model_ref_count_init (GtkTreeModelRefCount *ref_model)
 {
-  ref_model->priv = G_TYPE_INSTANCE_GET_PRIVATE (ref_model,
-                                                 GTK_TYPE_TREE_MODEL_REF_COUNT,
-                                                 GtkTreeModelRefCountPrivate);
+  ref_model->priv = gtk_tree_model_ref_count_get_instance_private (ref_model); 
 
   ref_model->priv->node_hash = g_hash_table_new_full (g_direct_hash,
                                                       g_direct_equal,
@@ -98,13 +97,7 @@ gtk_tree_model_ref_count_init (GtkTreeModelRefCount *ref_model)
 static void
 gtk_tree_model_ref_count_class_init (GtkTreeModelRefCountClass *ref_model_class)
 {
-  GObjectClass *object_class;
-
-  object_class = (GObjectClass *) ref_model_class;
-
-  object_class->finalize = gtk_tree_model_ref_count_finalize;
-
-  g_type_class_add_private (object_class, sizeof (GtkTreeModelRefCountPrivate));
+  G_OBJECT_CLASS (ref_model_class)->finalize = gtk_tree_model_ref_count_finalize;
 }
 
 static void